Recompute mode-lines when marking conflicts resolved

* lisp/vc/vc.el (vc-mark-resolved):
Recompute the mode lines of the affected files.

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index bc9f11202b1c30a3a3506863d57e0f3318a1fdde..00976a07d42b16ab1d60393ca84887fe2644f64e 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1549,6 +1549,9 @@ After check-out, runs the normal hook `vc-checkout-hook'."
          (vc-call-backend backend 'mark-resolved files)
          ;; FIXME: Is this TRTD?  Might not be.
          `((vc-state . edited)))
+    ;; Recompute mode lines.
+    (dolist (file files)
+      (vc-mode-line file backend))
     (message
      (substitute-command-keys
       "Conflicts have been resolved in %s.  \